broadway: Stop using gdk_device_manager_list_devices
authorMatthias Clasen <mclasen@redhat.com>
Wed, 26 Oct 2016 00:37:35 +0000 (20:37 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 26 Oct 2016 14:36:32 +0000 (10:36 -0400)
The function is deprecated.

gdk/broadway/gdkdevice-broadway.c

index aa9172d4532be881081cc9ed4cd75cc0399cdd54..5c9283795d64e4ac5edb031cc69d2adc67306190 100644 (file)
@@ -216,17 +216,14 @@ _gdk_broadway_window_grab_check_unmap (GdkWindow *window,
                                       gulong     serial)
 {
   GdkDisplay *display = gdk_window_get_display (window);
-  GdkDeviceManager *device_manager;
+  GdkSeat *seat;
   GList *devices, *d;
 
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-  device_manager = gdk_display_get_device_manager (display);
+  seat = gdk_display_get_default_seat (display);
 
-  /* Get all devices */
-  devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
-  devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_SLAVE));
-  devices = g_list_concat (devices, gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_FLOATING));
-  G_GNUC_END_IGNORE_DEPRECATIONS;
+  devices = gdk_seat_get_slaves (seat, GDK_SEAT_CAPABILITY_ALL);
+  devices = g_list_prepend (devices, gdk_seat_get_keyboard (seat));
+  devices = g_list_prepend (devices, gdk_seat_get_pointer (seat));
 
   /* End all grabs on the newly hidden window */
   for (d = devices; d; d = d->next)
@@ -240,16 +237,15 @@ void
 _gdk_broadway_window_grab_check_destroy (GdkWindow *window)
 {
   GdkDisplay *display = gdk_window_get_display (window);
-  GdkDeviceManager *device_manager;
+  GdkSeat *seat;
   GdkDeviceGrabInfo *grab;
   GList *devices, *d;
 
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-  device_manager = gdk_display_get_device_manager (display);
+  seat = gdk_display_get_default_seat (display);
 
-  /* Get all devices */
-  devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
-  G_GNUC_END_IGNORE_DEPRECATIONS;
+  devices = NULL;
+  devices = g_list_prepend (devices, gdk_seat_get_keyboard (seat));
+  devices = g_list_prepend (devices, gdk_seat_get_pointer (seat));
 
   for (d = devices; d; d = d->next)
     {